Constrain const vars to error if const types are mismatched #109336
Merged
+51
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
compiler-errors
force-pushed
the
constrain-to-ct-err
branch
from
420535a to
9174edb
Compare
compiler-errors
commented
Mar 19, 2023
| @@ -2,11 +2,11 @@ | |||
|
|
|||
| // An impl that has an erroneous const substitution should not specialize one | |||
| // that is well-formed. | |||
|
|
|||
| #[derive(Clone)] | |||
There was a problem hiding this comment.
This is necessary because otherwise, since we no longer emit a "conflict implementation" error, we then will fail b/c both impls are not WF (since S doesn't impl Clone) 🙈
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 21, 2023
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#96391 (Windows: make `Command` prefer non-verbatim paths) - rust-lang#108164 (Drop all messages in bounded channel when destroying the last receiver) - rust-lang#108729 (fix: modify the condition that `resolve_imports` stops) - rust-lang#109336 (Constrain const vars to error if const types are mismatched) - rust-lang#109403 (Avoid ICE of attempt to add with overflow in emitter) - rust-lang#109415 (Refactor `handle_missing_lit`.) - rust-lang#109441 (Only implement Fn* traits for extern "Rust" safe function pointers and items) - rust-lang#109446 (Do not suggest bounds restrictions for synthesized RPITITs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When equating two consts of different types, if either are const variables, constrain them to the correct const error kind.
This helps us avoid "successfully" matching a const against an impl signature but leaving unconstrained const vars, which will lead to incremental ICEs when we call const-eval queries during const projection.
Fixes #109296
The second commit in the stack fixes a regression in the first commit where we end up mentioning
[const error]in an impl overlap error message. I think the error message changes for the better, but I could implement alternative strategies to avoid this without delaying the overlap error message...r? @BoxyUwU